Added the basic entity stuff.