Work on merging changes and AI