More Assets

Also broken base class