VibeCode Planning

My goal is for you to complete this task. But first, we want to take a step back and really think this through. Start by reading through the relevant files in the codebase — do this intelligently until you feel you have all the context you need to write a good plan. Once you've done this, and you're sure you know everything you need to, write a comprehensive plan for how you will tackle this. Don't DO the task, just plan it out. Make sure you're not adding additional scope I didn't request.