Adds beginnings of selector functionality