Move ordering now based on toPiece
Merge remote-tracking branch 'origin/master'