New Container WIP
add composer and tests WIP
Composer + unit tests WIP
New lazy loading container
Merge branch 'master' into dev