Added some basic world and entity handling