Ejhernandez/enh oc migration step2

+ Merge from master to have screen 3 mocked up
+ Screen 2 with real exchange server working