Refactored board class
Merging
Merging