Worked a bit on world