Issue #15. Branch Iss15. Step twenty one: Updated Containers to utilize adapter instead of dict.