about to merge this and QuickFind to master