Changed selectors to XPath

Now just to add the loop and increment and we should be good to go.