Execution Refactoring, major simplification.