Looks like I fixed everything, used a little solder to connect the two points where the switch wires used to come out. Also used a little more solder on the -ve wire but couldn't really get to the area where the heatsink it. I'll see how it holds up.
But it works!
