Massive commit of all the guts