Attempt to sepeate "product" from "framwork"
Adding more changes.. Finder logic needs to be looked at.