Latest refactoring run. Loose error tolerance but did finish.