I'm planning to add a new Piece(again). Not sure about your first suggestion, I have never done that in the past.