Reports still broken. Leaving these changes to the side to pick up later