Seperated view from GameMaster code. Wrote a new
Merged conflicts