Continuing to refact to include lists.
Started adding list types again.