Revert "Revert "Revert "selector and such"""

This reverts commit edeee2174894f3a1959da596a2f8e6febf11b801.