Adding 'Conditional' and basic comparisons (no smoothing yet)