started to port goal reports to use new structure, probably not working yet