Removed a global, used as optional arg
Section F of report 1 needs work