Refactored rule set code, added service class
Merge branch 'master' of https://github.com/egreene/PracticeGDVP