Refactored some more elements of the code to be interchangable. Currently debugging communications of request/response messages.

1st iteration, next step is to add dynamic generation.