Temp commit. Need to make sure that responses are serialized correctly
Switch to use a universal client for making requests