more base logic/testing
Merge branch 'davebranch3'