Finished moving Viewer code out.