almost finished product, includes changes to the finders and other
things.