sort of done with the thread view
renamed certain things