Continued implementation of GoalCluster With last file!