Rewrote the initial version of reporting according to the new specs.
Additional work is needed.