Finished up some work on the viewers