Merge pull request #419 from Jedwondle/master

The wiring is in, needs to be debugged.