This commit has AI added (most) and built with no errors