Fix picking too many cards
Refactor
Detect when picking is done