[WIP] Lazy Dependency Injection

Changed the closure code to work with PHP 5.3 (removed $that …)