Move selection commands to command module

Is this what you were thinking?