Still need object classes for both of these. Suspect we'll need to assign "experimental" ones from our arc.
