refactored requests, tests passing but form not well formed yet.