Skeleton done, improved nav