exec refactor almost done