cleaning up hard coded answers

Working on forwarding headers and using headers to target APIs.