Overhauled finders and started adding entity creators/updaters.