Further progress on #78