Add support for AI and implement fake local connect
Merge