Rearranging some stuff, still need to redo the board vs game logic