Progress on #358