Finished Navigation Implementation

Removed a ton of unnecessary code.