progress on #29 and friends