Finalize basic User model

Before lab improvements