TGriffin clean up
Merge pull request #1 from r3dunlop/dev

TGriffin clean up