Some preliminary work on #11.