foundations stuff and section1
section 1 stuff
Fixed conflicts