Committing changed that spawned from CR

Some are incomplete, but giving the reins to Tod.