Feat/03 nav part1

Merge everything into dev!!