Initial changes to provide both a preview and edit mode.