add invoices
move finders to concern
clean up