WIP: waves selection before upload done