Refactoring, mostly to expose the server/cm in the returned daemon,
now a record