temp commit
fix assertion - can either be aggregate or instance
handle both aggr and non-aggr inverses
add a FIXME
temp commit