begin groundwork
Merge branch 'groundwork'