Pull supplier code out to a new class, fixes #12
Merge pull request #15 from service-enabled/feature/pull-supplier-out-to-class

Pull supplier code out to a new class, fixes #12