Added new features to the service. Commented out unused features.
Renamed service