Added tags capability.  Copy/paste hack job.  refactor soon.