Post-Turin gig commit. A bunch of stuff seems to have changed. Worthless commit message\!