factory to service
Merge branch 'chrisbbbranch'