Reorganizing how requests are created. Still unhappy with it, but it'll do for now.