@stof About to push this too along with a bunch of improvements. Does Doctrine use psr2? Or what's the "standard"?