Further progress on #8.