Progress on Login/Logout
Progress on Login/Logout
Finished Login
MERGE