Merge pull request #5 from dannuttle/master

TGT-1001 and earlier stuff