further progress on #34