Finder methods support. Some small reorganization. Still code is dirty, needs more refactor.