Tenancy dates

Updated to show relevant dates
Avoid using {...} for multi-line blocks.