Revert "Revert "Revert "Revert "UserModel almost finished""""

This reverts commit ec1c695cbedc67575da1912757d48245b4fd6894.