refactor Selector to allow X and Y selection