temporarily broken but compartmentalization underway, finally