Finished shallow nesting in invoices and closed #25