Finish major roads 1-3 refactor