This is the commit after getting rid of devise. Use as the base