2nd initial commit
Finish static pages
conflict