Lots of progress on #137