Added base class and stuff