Merge branch 'jake'
adding command interface
Merging changes from Master
Merge branch 'allen'
Add extra debugging/testing controls