Massive commit with a lot of stuff...