Added URL Functionality

And resolved some conflict problems