adding first http layer stuff
Merge resolution