Consolidate some stuff; add Users and login sessions