WIP: refactoring code to use new service API