I'm an idiot; sorted, finally