Added listners.  Updated Manifest.  Made baseClass