Updating the router to use observables.