Mostly done with #85.