Some progress reagrding the custom viewer.