feat/preview - more work