@sidehack- after careful consideration I have decided to forgo re-engineering a case. The fun part is outweighed by the cost part.