Replaced all the "selector-todo"s with the appropriate selector based on the comment above them.