Incorporate Kelli's OM setup notes