It also doesn't actually work :)

I want to get this PR merged; and then work on getting some proper test coverage.