I have gotten rid of this base class. Will push with other changes suggested