More work on Service stuff.