Almost have forwarding working, just ironing out a few compilation warnings