General pre-disaster

I'm going to optimise something, so this is necessary for when it goes
wrong