Host refactor

Maybe it should be a comment in the code. :-)