Lily's change in Oct. 4

Habib's code with working login and more changes from Lily
This should be an individual bug