This study investigated adding space to an existing facility that could be designed to serve the unique needs of geri-psychiatric inpatients. The addition would add 20 beds to the existing facility. A simple circulation spine that “zones” sleeping and daytime activities will enable substantial visualization and grants visual access to social spaces prior to entering. Abundant large windows in primary activity spaces, as well as sky lighting, brings light into the circulation core and nursing hub. In addition, the end of the unit’s primary corridor ends in natural light. The addition increases access to nature for residents and visitors via outdoor courtyard spaces. Entries to all primary social spaces can be monitored from the clinical station. Concern for “positive passive awareness” of the clinical environment was driven by prior experience; if clinical staff are at ease in the environment, the quality of clinical care goes up.