Added piece class, changed representation slightly