added a bunch to payload and broke separated a bunch out to Finder to share code between classes