Almost done with entities
removed pycs from merge