CONN-1300 Initial Check-in, still work in progress.

Please review and do not merge. This is still work in progress. Thank you.