Add Base Classes

2 Base classes edited. Will hopefully be able to work out a way of not
editing base classes for more compatibility.