progress on #129