Finished all class models
Merge origin/master