Subclass Rework In-Progress