First step into fixing hard-coded urls (#5).