Revert "Revert "A lot of Chris's code""

This reverts commit 856e4cec29f7c61c08273d5f74dbca808dcd5839.
Fix check for existence of service_names