Board functionality restored, refactor of game state