Added router to seperate concerns.