Initial Changes

Intention is to pull in the code and add switches to turn it on and off via configuration files