Sections 1 and 2 pretty much done