Nov12

Creating pull request for code review. See comments in diff.
these should be created in Main. Just pass them in as a parameter from Main.