Working on Section 7
Fixing some 'Define blah, where x'