More modularization of board game.