Light refactoring and renaming. Also now handling 'Piece' msg.