Fixed major bug with calculation, added support for expression for navigateTo and navigateFrom