Additional adjustments to subclasses.  Made them abstract;