T generic 01

I'm merging this with the master. I downloaded the changes straight from your branch so this means that yours are pushed too and you can just delete your branch, make a new one for more changes, and then we shouldn't have to worry about syncing them manually (since that's essentially what I did when I downloaded your changes and added my own!)