Revert "Ok this is the merge"

This reverts commit 676881167355435fda1ea2d4babdc90f157bc4dc.
Revert "Revert "Ok this is the merge""

This reverts commit e71164472ad0b3657242ded41ebda31556b4099e.
merge  fixes./updates

manually merged some files as some of my code was overwritten with
Kevin's merge