Consolidated calls and removed the exec_func for loop mess so we can have some low-cost debugging