Rush

[BockyBlock]

Balt's heading off in a week, so it's time I squeeze out that last bit in this pull request and get it over with, instead of ramping up the pressure

[balt-dev]

this might be the largest pr we've had