Started refactor of users