Updates for 'Pass1' replay

In retrospect I could/should have broken this up into a few discrete feature branches I guess...

I did try to keep the individual commits fairly discrete and appropriately commented though. Hopefully they are clear.

I would recommend not squashing the merge so the discrete commit information is maintained in upstream/master.