Initial commit
Fix world problems