added some more stuff to the view... cant really keep track of what anymore