Make the list...a list

Change-Id: Ic704590765bb7c169a12e72633347bd3cd78c1db