Laid groundwork for #40. Testing now.