Update prior to summit

Still not terribly clean