first attempt to fill containment, most looks fine, except for varaibles (works needs to be done here)
Merge branch 'master' of https://github.com/ruudvanderweijde/php-analysis