Before Teardown

A lot of work ahead!