Big, bad, awful commit!

Massive changes... naughty, naughty!