starting
Merge branch 'master' into davebranch1
initial skeleton code dump