Moves URL parsing in the model - wip