Add Preview refactor to master