ilya/resolver

Don't let the magic confuse you - these are not static classes!
2 19