wip: adding remote_url handling