move object handling to appropriate controller