Migration in progress to OO