Merge ai

Did more stuff