Make service into a gem
merge