Needs more switches................