Big-ish update

Mostly committing this in case of catastrophic code-change failures!