Containers comments/todo