Refactored! Moved board out :)