Pushing up UserType, User, and Contact, as well as test case for UserType. Will continue tomorrow.