testing a better navigation solution...