Selector changes

Split up functions that always return the original obj.
Removed single.