Models updated and finished

TODO: ViewModel, Exercises