restructured
disable neck in sim
Merge branch 'navig-fix'