#40 working invoices, closes #40