pretty broken state, but headed in right direction with invoices...