move message parser around