basic battles now work