partial work on #130