Added a User object, slightly smarter add_user and remove_user