working on the goals below