More report work
Added the todo's in the report