Finished the navigation.. somewhat