Working on AI plays
Fix merge