Many updates to support movement; Added Entities factory