Massive changes, almost final