Request wrapper changes are almost done. Mapping kinda works.