wip trying to fix rest. but it gets technical now that we removed TC from t/fun...