Added Entity class (UNFINISHED!)