Should this be called Application rather than Host? (I know not really part of this PR)