Baseline

This is the baseline version for the refactored Connector code
Changes from 0708

Changes from 0708