Code freeze almost done