Cleaned up some code and added all users