Wired up custom listener, added INavigator, added reroute method