Ai overhaul (4/19)

Ai overhaul