Added model classes for assignment 2.
Organize properties.
User state.