Cal props

I think we still need to add the mapping for merged_rev.keys(). Maybe add this?

    mixins.extend(merged_rev.keys())