nearly full conversion to new object manager