Additional Cleanup
Make a basic User model
Make a basic User model