Switch State Issues?

But then it just runs the first part for some reason by it self with no switch input??

It's almost the same as the initial sketch, you just fixed the hardware related issue. You still don't have a program state and react on it.