Semi working AI
Merge remote-tracking branch 'origin/A'