Pass through MACHINECLASS as hostname.  Also, chop the timeout way down from 1000 to 60 seconds