Host refactor

Yes, fixed.