added classes model. need to rework the views