Try router change

Taylor, see if this is useful - removed dependence on stack by using return instead. Works a treat.
Also noticed the develop branch didn't have the updating of files. That may need further attention.