So finally worked all the details!
I got the text that I had an allocation available on my name on 6/14 but wasn't able to go by until Monday this week.
On Monday we laid down initial numbers but had a brain fart and brought my 135i to work that day so couldn't work trade details.
Went by next day and everything lined up and left the current M2 at the dealer.
Week 40 build, October Delivery.
Doing ED + PCD.. need to start reading thread on ED to get some pointers!