WIP on URI resolver