Unfortunately, it's really tough to fix, and will require a lot of thought. I was planning to kick this can down the road a bit.