uncomment callback class
add a TODO notice