More Entity updates, began the EntityFactor (still unfinished)