Progress on #436