About halfway through
More changes