Total rework of the logic... for the better good.