--- CBOR-XS/XS.xs	2013/10/26 22:25:47	1.6
+++ CBOR-XS/XS.xs	2013/10/27 10:17:12	1.9
@@ -11,6 +11,35 @@
 
 #include "ecb.h"
 
+// known tags
+enum cbor_tag
+{
+   // inofficial extensions (pending iana registration)
+   CBOR_TAG_PERL_OBJECT    = 256,
+   CBOR_TAG_GENERIC_OBJECT = 257,
+
+   // rfc7049
+   CBOR_TAG_DATETIME    =     0, // rfc4287, utf-8
+   CBOR_TAG_TIMESTAMP   =     1, // unix timestamp, any
+   CBOR_TAG_POS_BIGNUM  =     2, // byte string
+   CBOR_TAG_NEG_BIGNUM  =     3, // byte string
+   CBOR_TAG_DECIMAL     =     4, // decimal fraction, array
+   CBOR_TAG_BIGFLOAT    =     5, // array
+
+   CBOR_TAG_CONV_B64U   =    21, // base64url, any
+   CBOR_TAG_CONV_B64    =    22, // base64, any
+   CBOR_TAG_CONV_HEX    =    23, // base16, any
+   CBOR_TAG_CBOR        =    24, // embedded cbor, byte string
+
+   CBOR_TAG_URI         =    32, // URI rfc3986, utf-8
+   CBOR_TAG_B64U        =    33, // base64url rfc4648, utf-8
+   CBOR_TAG_B64         =    34, // base6 rfc46484, utf-8
+   CBOR_TAG_REGEX       =    35, // regex pcre/ecma262, utf-8
+   CBOR_TAG_MIME        =    36, // mime message rfc2045, utf-8
+
+   CBOR_TAG_MAGIC       = 55799  // self-describe cbor
+};
+
 #define F_SHRINK         0x00000200UL
 #define F_ALLOW_UNKNOWN  0x00002000UL
 
@@ -614,13 +643,30 @@
   UV tag = decode_uint (dec);
   SV *sv = decode_sv (dec);
 
-  if (tag == 55799) // 2.4.5 Self-Describe CBOR
+  if (tag == CBOR_TAG_MAGIC)
     return sv;
 
+  if (tag == CBOR_TAG_PERL_OBJECT)
+    {
+      if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
+        ERR ("corrupted CBOR data (non-array perl object)");
+      
+      // TODO
+    }
+
   AV *av = newAV ();
   av_push (av, newSVuv (tag));
   av_push (av, sv);
-  return newRV_noinc ((SV *)av);
+
+  HV *tagged_stash  = !CBOR_SLOW || cbor_tagged_stash
+                      ? cbor_tagged_stash
+                      : gv_stashpv ("CBOR::XS::Tagged" , 1);
+
+  return sv_bless (newRV_noinc ((SV *)av), tagged_stash);
+
+fail:
+  SvREFCNT_dec (sv);
+  return &PL_sv_undef;
 }
 
 static SV *