fixed forwarding glitch, milestone 2 completed