More refactoring happening, login still not implemented