Massive commit with so much stuff