Progress on #733