Added install and teardown bits