Clean up casting, first attempt at sorted add using comparator. Properly adds all invoices, but does not sort them :(