Adding: inital work on selector