Initial assembly attempt
Merge pull request #2 from ncdc/master

Initial assembly attempt