Changed goals so that they get their currentValues by running through measures. Same for perspectives.