Progress on #543