changed things back to classes so interface stripping can work