Code Merge

And added kill switch schematic