Updating Router, almost finished.