first pass reordering
Merge remote-tracking branch 'mjberger/3dreordered' into 3dreordered