WIP: organization of certain functionality into services