Refactor of SelectorViw, in progress.