Moving old oop to OldOOP