Multiple Invoices.

Has anyone found a way, or heard of Jobber implementing a way, to add multiple invoices and quotes to one Job.  
For example, our company does appliance repair.  We schedule the diagnosis appointment and collect the service fee, or send a tech out to diagnose and they collect the service fee.  Then we write a quote for the repair.  Either with parts on the van, local parts, parts to order or an appliance to order and install.  
Sometimes we write two quotes, a repair quote and a quote to buy and install a new unit.  Then the customer can weigh the pros and cons of fixing vs replacing.  
Then the homeowner accepts a quote and it converts to an invoice and we perform the repair.  
As of right now we make a job, go out, diagnose, invoice the service call.  Then create a quote or two, they are approved, then converted to another job.  For every job, we have two jobs.  It would be nice if multiple invoices and quotes could attach to the same job, with all the information in one place.