Baseline 7/26

Signed-off-by: iMartha <tleonard2@iMartha-2.local>