Not done
Still working on further abstraction
removed player from game source