finished merging ai changes
ied progress...