Now Goal related stuff should match Peter's ppt, including the data flow. All manually tested, working fine.