Switch typing (13/23)

Switch typing