updated teh structure of the container + fixed the comments
fixed merge conflicts
fixed merge conflicts