current progress on #185