migrate models and manager to a nice done path