Refactoring to support branches better
Refactoring more
Board specs