rewrite to match new service API and enable some testing