Lay ground work for adding list back