Merge and rebase stuff i don't know
What it was like before TSA final, single socket, and before Sam does his magic
Adding back Images
Copy and pasted Sam's latest. Don't know what i'm doing