Added first pass at the view only mode