Added World; Added addtl functionality to Entity