Add all containers
Add basic admin
Merge conflicts