Progress on #758