OK, now it actually runs...

I so need to build a test suite.