Initial pull from Trevor.