Work in progress on moving to Identity Provider 2.0