#1 stuff
#3 - http stuff
Merge branch 'work'