Thread

I wanted to fix some thread issues and make it a little prettier.