Host refactor

Actually the 'dev' docs version is canonical for anything in internals.