Vid 1383

Don't merge just yet, still have to figure out why the last couple assertions are failing. 
This line seems like it would make more sense under the "//Special Urls - links to special pages" above. What about moving it to line 65?