Improvements to finder

Also added basic model