Added katie's changes

Updated forwarder and router to include Katie's implementations of all
the Router and some of the Forwarder methods