attempt to OurROM-ify more