More WIP
Merge pull request #8 from ncdc/build-poc

More WIP