Trying to update everything and ensure we are all on the same sheet

final merger to update all branches