Validate and service

PR which adds some validation and give the user a bit more control over enabling/disabling the service.