Committing this before I screw something.
There might be a big change incoming.