Partial commit of combat, also has int change for MySQLTastesFunny