Do more setup/teardown

Create new handler at start