FIXES #6 Add user management