Finished first working version of viewer