Services WIP take 2