Slowly adding more TLV code...