Invoicing System: Progress Update