Adding in MaskedInput and Switches.