[codr7]

I've been out of the feature factory loop for a little while, but something tells me reviewing PRs is more entertaining these days.