Add exec, and more notes for refactor