Debugging picking logic
Loose ends