I'd love to be able to use the simpler version of "line items" (which is currently used on the invoice templates) on an Agreement, so that it can look/function more like a traditional simple invoice but also include all the great blocks available on agreements.

Or maybe the reverse - add the same Agreement block options to invoice templates, so that we can do a 1-and-done workflow that contains everything in one place, without having to worry about the services options carrying over to an invoice as another step or item to track.