start to refactor, getting rid of message/response/line confusion