Code

Updated to additions for <switch>