@Avancee Totally. In this case, actually starting from scratch and trying to articulate the original problem helped me get to what I think will be a cleaner solution.