Untested

I've done some work on #9 but that's literally impossible to test alone.