Add Switch, not tested