Refactoring for structure since it is 2014
Finished up the login wrapper fix