Fixed some bugs but this is still not working. I need to modify the Navigator.