You know making tuples case classes is like my favorite refactoring in the world ;) Sounds like a plan!