Refactor to work with shared hosts

Closes #3