Eh there's more here than just the bug.

But I'll do that too.