I think I'll need you to show me what code should be moved and how it will be integrated the right way. For now, I've added a TODO at the top of this file.