Swap out if statements for switch
Add SWITCH block
Store the source of RUP instructions