Added Entity stuff, and a good chunk of the World class