Fixed up dataflow for Code.
Merge branch 'issue-74' into develop