Refactor CharClasses, begin adding NFA stuff