host lookup working
merge conflicts resolved