#[67599970] - tenancy demoted tenancy restructure

Would like to see a demo of this in the browser before we merge. -- Rob