Reimplements Taggable

Taggable was prior broken; this reimplements it.