The Computing Sciences Area at Berkeley Lab has recently consolidated operations to a new state-of-the art facility, Wang Hall, on the main Berkeley Lab Campus. This talk will cover some of the design decisions made in the construction of the building, given the steep grade, proximity to the earthquake-prone Hayward Fault, and availability of year-round cool air. In addition to the new building, the National Energy Research Scientific Computing (NERSC) Center is anticipating the arrival of Cori Phase 2, the next flagship high-performance computing system. Cori has been designed with features that will enable the success of both data- and compute-intensive workloads. For example, one of the features chosen for data-intensive workloads is an innovative Burst-Buffer to which uses large amount of NVRAM that delivers massive IO bandwidth. The majority of the compute nodes will feature the new Intel MIC (Knight's Landing) architecture, combining many simple cores on to a single chip, for extreme floating-point perormance while largely preserving the ability to use familiar programming languages for modeling and simulation workloads. We will cover the basic design of Cori Phase 2 and the plans to migrate the NERSC user-base to this new system.