#12068 Comminting changes and stuf

THis is fun