Refactored selection to use a component, added the respective system