some progress on #26