Finishing up some work on #122