Finished Extractor and Navigator
Added more functionality to navigator and extractor.  Fixed some bugs