Add more TODO notes
Add debug output for more debug listeners