Moved Goals.plan over to plan branch