Started responder stuff
Fixed merge conflict