Merged console thread into mine
Finalizing Test2
Fixing Test2 for directory 1
Fixing conflicts from fixing test2