working on #105 (osbdoc rearrangement)