More work on the Host software.