First attempt at managing selection