Router and Controller finished