Work-in-progress - integrating Image Preview