Started work on switch dialog