Url checking

This is better than checking all urls.  

There's still a lot of room for cleanup, but this should catch much of our issues. 
Rewrapped