move handlers out
remove dismiss
add dismiss and accept handle