BUG: generic top down WIP, fix Estimator signature