services refactor
Merge pull request #85 from ngoldman/services-refactor

services refactor