Draft of all URL endpoints

I''m just going to do a global find/replace....