Working on #88.