Rough work on new OC 2.0 style adapter classes