Maintenance (comments, renaming)
Prettying the code.
Updated container populating example to new containers and mock data.
Tests for containter API consistency and functionality.