Groundwork for resume
Merge pull request #1 from carawarner/feature/resume

Resume