Misc Chages including start of AI rework...