a ton of changes almost done