Some more work on power system infrustructure