The Solar District Cup is a two-semester design competition sponsored by the U.S. Dept. of Energy. For this competition, teams from across the nation are tasked with designing the most efficient and cost-effective solar plus storage system for a unique district case. The Embry Riddle team was tasked with designing such a system for New Mexico State University (NMSU) in Las Cruses, NM. During the first semester, the team's primary focus was on selecting the photovoltaic panels and equipment used, placing/wiring that equipment across the campus, and developing a plan that would finish construction of the system within 6-months. For this second semester our focus has been on how to incorporate an energy storage system that will allow NMSU to lower their daily peak demand charges without affecting the 6-month construction period, and, per the competition requirements, ensure that the entire project will be fully paid back within 25 years. Our results showcase our proposed design, with a focus on the benefits associated with installing such a system.