Cleaned up a little and made a service for all counters.