More services & small clean ups

Why? This is the way it's always been done for adding new services.