progress on #120