Mroe edits/changes

moving things around [#61070860]