Woot, it worked the first time.

Who'd have thought!
Closes #35