Another "hopefully won't explode"... new freeze system & some more merging