WARNING: Expect lots of force-pushes in the near future while I clean things up, I'll remove this note when that's over.