Simplify
Added some dependencies, restored the service runner.