CBC Scanning Fixed

This is the version used at hushcon - it needs to be cleaned up before
taking pull requests, adding to bapp, etc., but it should be useable in
a week or so