Url lookup

Last commit is the relevant one.