Modified by adding state and subboard classes