Clean up the code some
Actual working code
wrong event
Add row to the result set