Navigation up 460

This seems to work for me, but in order to test it I need the logic in the other slug branch. Ok to merge them both and then make a new test to make sure they interact well?