Progress on #66