More hookups
Merge branch 'master' of github.com:themattharris/chimehack