more todo hints on container code