Refactored moved selector logic to its own object.