Removed todo, added another container option