Added basic world + entity code