changing how class escaping works
Merge pull request #828 from icambron/better_class_checking

changing how class escaping works