More complete/clean version of hierarchical build