Infrastructure redo

Body Infrastructure change adding a lot more here

Matthew test sentence at 07/15/2021 11:50 AM