merge attempt 1
1st merge attempt
1st merge attempt
Post merge fixes