did some work laying the ground work for a report geneartion

author: nhhughes
fixed merge