some progress on #58