New board, some refactoring