pushing latest changes. things still crash so hard.