Switch typing (2/23)

Switch typing