[WIP] Crushing c&p, hat&whip edition

NO MERGE ;-)