Debugging / XOR

Lots of debugging stuff (commenting a lot of things out to get to
later). XOR actually works now.