reorganized stuff + worldObject