WIP: Code review - Redoing how exclusions are tracked

* A bug exists for inherited classes