add props for compat.
split incoming into two
add shims for the split.