Updated + implemented more stuff