Your plan sounds reasonable. I commented out the part line and a TODO