changes, added a few base classes