Added more content to everything and finished Entity.java