Working on #82.