First passes. I think I am going to come back do this over
Merge branch 'feat/modeling-the-game'