Prepped for use by others.

Service Reference Removed, refactored in places.