Working on hostname change

still needs some work