navigation finished, ready to merge to master