Preparing for Viewer/Previewer/Editor Refactoring