Merge pull request #475 from jonohart/fw

Implemented the bulk of the changes to the Forwarding module