Big advance on the finder (still several bugs to fix).