Entity classes added

edited entity classes and worked on stuff with adian and irene