Tidy up code and improve handling of lockdown mode
Tidy up code and improve handling of lockdown mode

concord-consortium/building-models,concord-consortium/building-models,concord-consortium/building-models,concord-consortium/building-models,concord-consortium/building-models