Continuing work on #205