Closes #67 and shrinks scope for exec of dynamic functions