Host refactor

Done.