Login/Logout improved
Messing around with how to best do the data access