NOW done. Mostly.