Added service implementation, wireup and tests