Section 2 almost ready

Tons of changes