squash this commit - testing and refactoring to host_common