I Have No Idea What I Did Here, But I Did It

See above. Turns out I didn't commit some stuff before promptly
forgetting everything.