Ongoing Viewer mixin work.