More work on #48 to get to #60....