Working on getting the forwarding to work correctly