Single-host demo setup
Starting tweaks to host setup