Moving to a container class.