Added 3 lists. Need to combine into one and properly manage sections.
Types now appear in a list.