Merge code from Map.pde into Board.pde