WIP: redesigning wave picker