Merge branch 'Testbench'
Rename Setup Function
Commenting out some broken stuff for production
Merge branch 'master' into Testbench