Refactor World II

AI still broken