WIP: wave Picker redesign