I'm trying to have the user provide the billing and shipping address during the checkout process. I create two OrderAddress objects (orderAddress and billingAddress). After that I add the objects to the OrderAddresses collection:

CartHelper.Cart.OrderAddresses.Add(billingAddress);
CartHelper.Cart.OrderAddresses.Add(shippingAddress);

Then I define that I want to use the billingAddress for my Billing Address:

CartHelper.Cart.OrderForms[0].BillingAddressId = billingAddress.Name;

I also make sure that my shippingAddress is used for my shipment:

shipment.ShippingAddressId = shippingAddress.Name;

and that my billingAddress is used with my payment:

paymentInfo.BillingAddressId = billingAddress.Name;

after that I create my order from the cart.

What I'm trying to achieve is that the billingAddress information will show up as the billing address in Commerce Manager and that the shippingAddress information turns up as the address for the shipment.
Problem is that whatever address I add to the OrderAddresses collection first, is the one that will show up in both places. I want different information in shipping and billing and I want it to be tied to the order, not the user.