WIP - 1/3 of the user management