Added Board class + small changes