Big change to execution.

Moved all code for execution to the else statement
Merge branch 'Production' of https://github.com/sebisges/EECS678Project1 into Production