Host Refactor

Includes #54 (closed) #47 (closed)