adding a lot of new stuff
new.html -> index.html
merge incoming changes