Added: Start of shipping shared functionality into services, with tests