Worked some more on building URL