Completed work on #347, starting to think about #348