Revert "UserModel almost finished"

This reverts commit c56bca3c251838efbccbfc9305238fa9251a8993.
Revert "Revert "UserModel almost finished""

This reverts commit 3c5f25c8afc21f693c873cc1836deef62221995c.
Revert "Revert "Revert "UserModel almost finished"""

This reverts commit d1ebd1846b34f164175f710a02fe65ccf86477eb.