Fleshed out Entity, added PlayerEntity