Secondary commit

Commit from second computer.  Hoping this helps sync the computers.
Resolving merge conflicts