Merge in from local repo

Merging changes from prototype build and test