Working on viewer implementation
Working on viewer