Need to separate POE/Invoice for now
First pass at single / multi adds