board-refoactor - in progress