* Add more factories Revert main.background factory usage. We could still do this, but factories must init their services and so need to be async, which is not compatible with initializing in constructors * Fix conflicts
Matt Gibson