Progress on #117
hackey progress on #117