Invoices

i know it's under development, but just 2 tiny questions:

• will we get a shortcode for the shop address block that we can put in the invoice
• can we have custom fields in the address block? here in germany we need tax number/ VAT-number on the invoice, so it would be great if we could put this information in the settings and it's gonna be displayed on the invoice