added modeling to the nav
Merge branch 'walport-water' into testing