Progress on #74