updates and adds viewer

Signed-off-by: Daniel Berry <danielberrytn@gmail.com>
merging changes

Signed-off-by: Daniel Berry <danielberrytn@gmail.com>