#7 #6 Added urls and end to end logic