Functioning multiple url version
with latest changes pulled in from master.