Improved the test data
Improved the event layout
Created a TODO list