Fixed #1 - Converted Board to GridBoard