Working on adding topic source urls - got an infinite loop somewhere :(