Host refactor

Good idea!