Dirty commit with pieces working