rebase + entitiy_list tracking
readme
rebase