Progress on #86