progress on #37