Ties into #61
Ties into #61