Everything is working despite the bug

But the bug needs fixin'.
Going to need to break things in order to fix them.

Just a friendly little commit before I break things.