Refactored board and room stuff