Containers: todo notes and comments