Close to fixing this retrieving the current url error.