Update2

base classes necessary for all future builds