Not quite there yet with PSR-0 compatibility...