finished implementing User model. Revised other models.