continuing work on the dulwich package