refactoring for demo setup
demo
Merge pull request #5 from patriot1burke/master

more impl and demo start