kkolchier/kmoore - adding exclusions and null tokens