Some headway into splitting repairs into Invoices and Estimates.