Report 2 update.

Will have to be rewritten I feel...