fix ordering of urls, ugh, need to write more tests