overhauled design
Merge pull request #46 from rwarbelow/staging

overhauled design