first round of changes.  Doesn't compile, no surprise!
Merge branch 'master' of github.com:cambridgehackers/xbsv