Working on T3
Finishing up on T3
Merging T3 into Master.