I will install a disconnect before the switch. At that disconnect I will isolate the neutral from there. From the switch to the panel I will have them isolated. However, they are not currently isolated in the panel. I will need to separate them in the panel, correct.