Begin addition of support for tags
2 files changed