Moved some of the boiler plate stuff to the manager.