Modified Space and Gameboard
Fix merge conflict (hopefully)
Minor change to Gameboard