WIP: use local service instead