Pull TagsAsClasses from @cjbell88