add stoppable_sink/refactor
add hit_test