* mshef: trying to refactor - extracted methods to objects by their functionality
* mshef: report for hef1 now has all columns (need to test on real app)