Changing things to rely on board

Will remove GameBoard afterwards.