Merged fillBoard and testWin branches.