wave navigation further progress
commit