2 More Commits and Section 2 is done

This thing is long....