Add a basic user model (including secure passwords)
Rearrange model for efficiency