Accidentally broke all of this. Fix, refactor, golden.