Tenancy & User Management

TBD - Tenancy and User Management are currently in heavy flux