Thanks Luke. We do have ADFS.
The issue then will be mail flowing continuing in our On-Prem. Our plan was create a new either SEG/PS config when our WS1 environment moves to the SaaS.
We also introducing a CASB in the mix which sits in front of O365 and is causing some conflicts.