this definitely gets the job done, curious if you guys have explored a more central location for this type of logic so that future issues don't sprout up?