Did you decide if moving all of this from the "build" section to the "reporting" section was actually necessary?  Or is this left over from other things you were trying?