Updated things to use BoardMaster