IceCream in new file. Almost complete overhauls.