Merge branch 'master' into Walker_Branch
removed old function
Merge branch 'Walker_Branch' into Brandon's-REAL-Test-Branch
add comments. remove old code
Merge branch 'Walker_Branch' into Brandon's-REAL-Test-Branch