Entire build works; now just to finish powerflow
Same as last; corrected small error