Fixing the response build
Moving some code, to free up some names
Fixing the builders so we can have encoders and decoders