Add hostname
More progress