Started working on initial Entity transfer