New reports

Just split the logic and presentation so we can run them in new reports separately.