Event Lists are filled with data

- Multiple Refactors
- Deleted "Legacy" code and useless variables