Added hostname stuff, hopefully this uses hostname