Merging of versions between Kyles and my stuff