Updated to take URL as well, woohoo!