This document discusses various aspects of energy infrastructure planning, including electricity generation, transmission, distribution; petroleum pipelines and storage; and relevant legislation. It provides schematics of electricity and petroleum infrastructure networks. It also discusses the deregulation of the electricity industry in the 1990s, the roles of public and private utilities, and issues around nuclear waste storage. Key events that shaped energy policy and markets are summarized such as the 2005 Energy Policy Act and California's renewable energy initiatives.