Some work on #83