simplify
more service setup, but it's still a mess (and wrong)