Major changes for making the model compatible with the GameView
Merge and same fixes as previous commit