initial work on #196