Almost got user management working now