More intro rearrangement and build fixing
Comment that back out now