moving code back out to service