There's some things edited by hand, so I need to confirm that I can do this automatically, but still it's a big step so worth a checkpoint.
