Updated code, need to figure out (hopefully) one of the few final issues, specifically hostnames.