New viewer work in progress.