Got rid of Board class