Working on removing all global variables.
Merge pull request #12 from meltcaleb/master

Working on removing all global variables.