Nginx

See commits for more details. I know still many things to fix but you are changing things daily so have to push my stuff as well otherwise will be even harder to merge