Navigation #1

Commenting out old code to make way for new!