Incrememntal update to get to POC

These changes are pretty wide spread, but gets us to a sample to work
from - a working POC. It is intended to be a starting point for additional feature-
specific changes, as well as additional testing.