Refactoring in preparation for handling more cases than client sending one packet.