Just finished cleaning up my branch so it can be merge. The PR's Diff is massive... probably the largest on the team based on new lines of code.

Basically a migration of a massive report that took almost 2 years to resolve most of the diffs.

Now just need to get it ready production... By next weekend