Add in automatic hostname grab