Finished renaming 'board' to 'matrix'