remove name from finish
add fake handler scaffold