Stepping closer to proper response handling