I thought of the Air as portable without the features and Macbook as entry level full featured. I am having a hard time wrapping my mind around a full featured Macbook for $800.
Depending how 'good' the new macbook design is, I can see the air struggling and not looking quite as 'special' as it did against the current line up.