Updates from prototype build and testing.
Merge pull request #1 from cclark2/master

Merge in from local repo