Added Reports by Year and Huge Amount of Code and Query Refactoring