Thread

I want to build the unified view, but when refactoring I had to go break it apart to avoid building too much into the same view