First Part of Add to Route
Merge some conflicts?