added world stuff + battle sruff