added AI stuff
resolve some merge shit