Lots of changes for switches + lists
Lots of changes for switches + lists