Big commit right before my flight to Seattle