Started refactoring to add container