switch to using linked lists for subclass tracking again