AI working
pretty much done
merge fix