A bunch of ai changes
merging