Progress on #90