break condition addition into own mapper
reapply conditoins
move function out of way
remove incremental dict creator