First pass as picking
Merge