Additional work on report, needs a lot more work