Progress on #289