Basic navigation working mostly
Rough draft of navigation up and running, need to refactor