In progress almost done. Problems in entity creation