Services v2

I am not sure why github is showing extra stuff, but this is more for your awareness to pull into your branch as I do not have time to rebase to your latest.

see config-default.sh and util.sh changes