major cleanup in interaction strategy