Mostly finalized version of user management features