Router Forwarding v 2.0

Just a few minor changes now. This is the stable version