Work on Entity.java & Subclasses