Added in some logic to do URLs