entity management

entity management complete.