separate finder class
history with snapshot restore
add finder assert on fn