start adding tagging, not quite there yet