4.0.3 Stable Push

So much new stuff, refactors, etc