WIP - changed contract for service