working on #72 only the goal code missing