Services WIP take 3