So I did a lot of these refactors working on 84005{6,7,9} - 75e5615a132e8659371705563f47ba36d6893709